From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 1 Oct 2011 18:47:22 +0000 (-0400)
Subject: Merge changes from emacs-23
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2070
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8ef35e4c0855e932e387c72ddc5fed0338c6d250;p=emacs.git

Merge changes from emacs-23
---

8ef35e4c0855e932e387c72ddc5fed0338c6d250